Revision: tla--gpg--1.1--patch-17
Archive: rbtcollins@hotmail.com--barch
Creator: Robert Collins <rbtcollins@hotmail.com>
Date: Sat Dec 20 17:00:36 EST 2003
Standard-date: 2003-12-20 06:00:36 GMT
New-files: PLUGIN/auto libarch/editor.c libarch/editor.h
Modified-files: ChangeLog libarch/apply-changeset.c
    libarch/cmd-build-config.c libarch/cmd-commit.c
    libarch/cmd-get.c libarch/cmd-grab.c libarch/cmd-mv.c
    libarch/cmd-rbrowse.c libarch/cmd-star-merge.c
    libarch/cmd-undo.c libarch/cmds.c libarch/configs.c
    libarch/library-txn.c libarch/pfs-dav.c
    tests/test-undo.sh
New-patches: jblack@merconline.com--2003/tla--devo--1.1--patch-50
    jblack@merconline.com--2003/tla--devo--1.1--patch-51
    jblack@merconline.com--2003/tla--devo--1.1--patch-52
    jblack@merconline.com--2003/tla--devo--1.1--patch-53
    lord@emf.net--2003b/tla--devo--1.1--patch-278
    lord@emf.net--2003b/tla--devo--1.1--patch-279
    lord@emf.net--2003b/tla--devo--1.1--patch-280
    lord@emf.net--2003b/tla--devo--1.1--patch-281
    lord@emf.net--2003b/tla--devo--1.1--patch-282
    lord@emf.net--2003b/tla--devo--1.1--patch-283
    lord@emf.net--2003b/tla--devo--1.1--patch-284
    lord@emf.net--2003b/tla--devo--1.1--patch-285
    lord@emf.net--2003b/tla--devo--1.1--patch-286
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-55
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-56
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-57
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-58
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-59
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-60
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-61
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-62
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-63
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-64
    rbtcollins@hotmail.com--barch/tla--gpg--1.1--patch-17
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-42
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-43
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-44
    walters@verbum.org--2003/tla--lifeless-integration--1.1--patch-7
    walters@verbum.org--2003/tla--mainline--1.1--patch-54
    walters@verbum.org--2003/tla--mainline--1.1--patch-56
    walters@verbum.org--2003/tla--mainline--1.1--patch-57
Summary: merge from rbtcollins@hotmail.com--barch/tla--integration--1.1

Patches applied:

 * jblack@merconline.com--2003/tla--devo--1.1--patch-50
   changed arguments for abrowse so that argv[1] is regex, added -a (all archives) option

 * jblack@merconline.com--2003/tla--devo--1.1--patch-51
   Set up rbrowse to ignore -SOURCE and -MIRROR archives

 * jblack@merconline.com--2003/tla--devo--1.1--patch-52
   Star merged Tom

 * jblack@merconline.com--2003/tla--devo--1.1--patch-53
   Fixed grab. It works with not-fully-qualified revisions now

 * lord@emf.net--2003b/tla--devo--1.1--patch-278
   --hard-links => --links (Pau)

 * lord@emf.net--2003b/tla--devo--1.1--patch-279
   tla help and http_proxy fixes (miles)

 * lord@emf.net--2003b/tla--devo--1.1--patch-280
   grab and rbrowse tweaks (jblack)

 * lord@emf.net--2003b/tla--devo--1.1--patch-281
   undo command line parsing fix (walters)

 * lord@emf.net--2003b/tla--devo--1.1--patch-282
   $EDITOR support (walters, rbcollins)

 * lord@emf.net--2003b/tla--devo--1.1--patch-283
   no guessing at $EDITOR

 * lord@emf.net--2003b/tla--devo--1.1--patch-284
   command line processing in star-merge (walters)

 * lord@emf.net--2003b/tla--devo--1.1--patch-285
   --links => --link

 * lord@emf.net--2003b/tla--devo--1.1--patch-286
   make sure diff and diff3 are good during config

 * miles@gnu.org--gnu-2003/tla--devo--1.1--patch-55
   Merge from Tom

 * miles@gnu.org--gnu-2003/tla--devo--1.1--patch-56
   Merge from Tom

 * miles@gnu.org--gnu-2003/tla--devo--1.1--patch-57
   Merge from Tom

 * miles@gnu.org--gnu-2003/tla--devo--1.1--patch-58
   Swap `aliasness' of OP-id and OP commands

 * miles@gnu.org--gnu-2003/tla--devo--1.1--patch-59
   Merge from Tom

 * miles@gnu.org--gnu-2003/tla--devo--1.1--patch-60
   Merge from Tom

 * miles@gnu.org--gnu-2003/tla--devo--1.1--patch-61
   Correctly handle missing trailing slash in http_proxy

 * miles@gnu.org--gnu-2003/tla--devo--1.1--patch-62
   Merge from Tom

 * miles@gnu.org--gnu-2003/tla--devo--1.1--patch-63
   Merge from Tom

 * miles@gnu.org--gnu-2003/tla--devo--1.1--patch-64
   Merge from Tom

 * rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-42
   merge with tom

 * rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-43
   merge with lord@emf.net--200b/tla--devo--1.0

 * rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-44
   Robin Farine's permissions-application bugfix

 * walters@verbum.org--2003/tla--lifeless-integration--1.1--patch-7
   use $EDITOR for "tla commit"

 * walters@verbum.org--2003/tla--mainline--1.1--patch-54
   use tree archive for undo shortcut (savannah #6541)

 * walters@verbum.org--2003/tla--mainline--1.1--patch-56
   pull $EDITOR on "tla commit" from lifeless-integration

 * walters@verbum.org--2003/tla--mainline--1.1--patch-57
   star-merge archive defaults to tree-version archive

